Skip to content

Fix #admin room visibility in LHN for Track Workspace onboarding - #94104

Merged
lakchote merged 7 commits into
Expensify:mainfrom
emkhalid:fix-92431-track-workspace-admin-lhn
Jun 26, 2026
Merged

Fix #admin room visibility in LHN for Track Workspace onboarding#94104
lakchote merged 7 commits into
Expensify:mainfrom
emkhalid:fix-92431-track-workspace-admin-lhn

Conversation

@emkhalid

@emkhalid emkhalid commented Jun 19, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Explanation of Change

This PR fixes the Track Workspace onboarding flow so the workspace #admin room stays visible in the default LHN.

The fix is intentionally scoped to the two gating conditions identified in the approved proposal:

  1. Allow admin rooms to bypass the hidden-report gate in SidebarUtils
  2. Exempt admin rooms from the empty-chat exclusion in ReportUtils

This preserves the Concierge routing introduced by PR #82804 while restoring the expected LHN visibility for the #admin room.

Fixed Issues

$ #92431
PROPOSAL: #92431 (comment)

Tests

  1. Start from a fresh account without + in the email.
  2. Complete sign up.
  3. Choose Track expenses for my business.
  4. Verify a workspace is auto-created.
  5. Verify the workspace #admin room appears in the default LHN without needing search.
  6. Search for the workspace #admin room.
  7. Verify it is still returned in search.
  8. Create a second workspace.
  9. Verify the second workspace #admin room also appears in the default LHN without needing search.
  10. Verify ordinary empty chats are still not shown in the default LHN.
  11. Verify that no errors appear in the JS console.
  • Verify that no errors appear in the JS console

Offline tests

  1. Repeat the flow online until the workspace is created and the #admin room is visible.
  2. Go offline.
  3. Verify the already visible #admin room remains accessible from the LHN.
  4. Verify no new console errors appear while navigating between the workspace and Concierge offline.

QA Steps

Same as Tests

// TODO: These must be filled out, or the issue title must include "[No QA]."

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
android-native-admin.mp4
Android: mWeb Chrome
android-web-admin.mp4
iOS: Native
ios-native-admin.mp4
iOS: mWeb Safari
ios-web-admin.mp4
MacOS: Chrome / Safari
macos-admin.mp4

@emkhalid
emkhalid marked this pull request as ready for review June 19, 2026 23:59
@emkhalid
emkhalid requested review from a team as code owners June 19, 2026 23:59
@melvin-bot
melvin-bot Bot requested a review from linhvovan29546 June 19, 2026 23:59
@melvin-bot

melvin-bot Bot commented Jun 20, 2026

Copy link
Copy Markdown

@linhvovan29546 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@melvin-bot
melvin-bot Bot requested review from heyjennahay and removed request for a team June 20, 2026 00:00
chatgpt-codex-connector[bot]
chatgpt-codex-connector Bot reviewed Jun 20, 2026
View reviewed changes

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 5a10a3e3bb

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread src/libs/SidebarUtils.ts Outdated
isFocused ||
isSystemChat ||
!!report.isPinned ||
isAdminRoom(report) ||

@chatgpt-codex-connector chatgpt-codex-connector Bot Jun 20, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Restrict admin-room hidden override to chat reports

This exemption applies to any report whose chatType is policyAdmins, not just the root #admins room. Admin-room task reports intentionally inherit that chat type for routing (buildOptimisticTaskReport in src/libs/ReportUtils.ts), and those task reports are created with notificationPreference: hidden; after this change, completed/non-actionable tasks under #admins bypass the hidden-report gate and fall through to the default LHN inclusion path. Please limit the override to actual chat rooms, e.g. isChatReport(report) && isAdminRoom(report), so hidden child task reports do not appear in the LHN.

Useful? React with 👍 / 👎.

@emkhalid emkhalid Jun 20, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed

@github-actions

github-actions Bot commented Jun 20, 2026

Copy link
Copy Markdown
Contributor

⚠️ This PR is possibly changing native code and/or updating libraries, it may cause problems with HybridApp. Please check if any patch updates are required in the HybridApp repo and run an AdHoc build to verify that HybridApp will not break. Ask Contributor Plus for help if you are not sure how to handle this. ⚠️

@linhvovan29546

linhvovan29546 commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

@emkhalid Could you please merge main? and resolve the PR Author Checklist https://github.com/Expensify/App/actions/runs/27855249389/job/82441406574?pr=94104

@emkhalid

emkhalid commented Jun 24, 2026

Copy link
Copy Markdown
Contributor Author

@emkhalid Could you please merge main? and resolve the PR Author Checklist https://github.com/Expensify/App/actions/runs/27855249389/job/82441406574?pr=94104

Thanks for the review, I merged the main.

linhvovan29546
linhvovan29546 suggested changes Jun 25, 2026
View reviewed changes
Comment thread ios/Podfile.lock

@linhvovan29546 linhvovan29546 Jun 25, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please revert the changes in this file? I don’t think this PR needs them.

@emkhalid emkhalid Jun 25, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed, thanks.

Comment thread src/hooks/useAutoCreateTrackWorkspace.ts Outdated
isSelfTourViewed,
});

if (!isSidePanelReportSupported) {

@linhvovan29546 linhvovan29546 Jun 25, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need this change?

@emkhalid emkhalid Jun 25, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@linhvovan29546 Thanks for the review.

I left the useAutoCreateTrackWorkspace.ts change for now because in testing the fix worked on web, but native still reproduced until I added the native-only wait after CompleteGuidedSetup. It seems native navigates before the write queue is fully settled.

If you want this PR kept strictly to the approved SidebarUtils/ReportUtils scope, I’m happy to remove that hook change and treat native as a separate follow-up.

@linhvovan29546 linhvovan29546 Jun 26, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@emkhalid Hmm, I can't reproduce the bug you mentioned.

Screen.Recording.2026-06-26.at.16.54.00.mov

@emkhalid emkhalid Jun 26, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@linhvovan29546 Thanks for the review, and apologies for the confusion.

I re-tested after reverting the useAutoCreateTrackWorkspace.ts change, and you were right — the fix works without it. I likely tested it incorrectly earlier and assumed that native-only wait was needed when it wasn’t.

I’ve reverted that hook change so this PR is now scoped only to the approved fix.

@linhvovan29546

linhvovan29546 commented Jun 26, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp
telegram-cloud-document-5-6192769913669558441.mp4
Android: mWeb Chrome
telegram-cloud-document-5-6192769913669558442.mp4
iOS: HybridApp
Screen.Recording.2026-06-26.at.17.24.57.mov
iOS: mWeb Safari
Screen.Recording.2026-06-26.at.16.54.00.mov
MacOS: Chrome / Safari
Screen.Recording.2026-06-26.at.17.22.39.mov

@linhvovan29546

linhvovan29546 commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

@emkhalid Could you please add a unit test?

@emkhalid

emkhalid commented Jun 26, 2026

Copy link
Copy Markdown
Contributor Author

@emkhalid Could you please add a unit test?

Thanks for the review, Done.

linhvovan29546
linhvovan29546 approved these changes Jun 26, 2026
View reviewed changes

@linhvovan29546 linhvovan29546 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@melvin-bot
melvin-bot Bot requested a review from lakchote June 26, 2026 11:58
lakchote
lakchote approved these changes Jun 26, 2026
View reviewed changes

@lakchote lakchote left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@lakchote
lakchote merged commit 1a0d813 into Expensify:main Jun 26, 2026
34 checks passed
@github-actions

github-actions Bot commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

🚧 lakchote has triggered a test Expensify/App build. You can view the workflow run here.

@github-actions

github-actions Bot commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #94104.

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-1a0d8139446-27a47d6-06048e2c665b2703fba72549cab52a8fe26622c0/index.html https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-1a0d813-27a47d6-ee4d785f142bddcbfd4fe470126bb5db5e50b773/index.html
Android iOS
Web 🕸️
https://94104.pr-testing.expensify.com
Web

👀 View the workflow run that generated this build 👀

@OSBotify

OSBotify commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@OSBotify OSBotify mentioned this pull request Jun 26, 2026
Closed
55 tasks
@OSBotify

OSBotify commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/lakchote in version: 9.4.21-2 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@applause-bot applause-bot Bot mentioned this pull request Jun 27, 2026
Closed
7 tasks
@mitarachim

mitarachim commented Jun 27, 2026

Copy link
Copy Markdown

Deploy Blocker #94747 was identified to be related to this PR.

@mitarachim mitarachim mentioned this pull request Jun 27, 2026
Open
7 tasks
@jponikarchuk

jponikarchuk commented Jun 28, 2026

Copy link
Copy Markdown

Deploy Blocker #94781 was identified to be related to this PR.

@mountiny mountiny mentioned this pull request Jun 29, 2026
Merged
@OSBotify

OSBotify commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.4.21-9 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

Bundle Size Analysis (Sentry):

@MelvinBot MelvinBot mentioned this pull request Jul 6, 2026
Closed
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@chatgpt-codex-connector chatgpt-codex-connector[bot] chatgpt-codex-connector[bot] left review comments
@lakchote lakchote lakchote approved these changes
@heyjennahay heyjennahay Awaiting requested review from heyjennahay
+1 more reviewer
@linhvovan29546 linhvovan29546 linhvovan29546 approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@emkhalid emkhalid

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@emkhalid @linhvovan29546 @OSBotify @mitarachim @jponikarchuk @lakchote